luci-mod-network: Fill ipset name choice with available firewall ipsets

Signed-off-by: Paul Donald <[email protected]>

diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
index 9a6240b69fb49065895e9efd379c7d8ec04cc349..0621a12d2484dd638dac3372dc49c9e182566e3e 100644 (file)
--- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
+++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
@@ -277,7 +277,8 @@ return view.extend({
                        callHostHints(),
                        callDUIDHints(),
                        getDHCPPools(),
-                       network.getNetworks()
+                       network.getNetworks(),
+                       uci.load('firewall')
                ]);
        },
 
@@ -976,6 +977,11 @@ return view.extend({
                ss.modaltitle = _('Edit IP set');
 
                so = ss.option(form.DynamicList, 'name', _('Name of the set'));
+               uci.sections('firewall', 'ipset', function(s) {
+                       console.log('fukt:', s);
+                       if (typeof(s.name) == 'string')
+                               so.value(s.name, s.comment ? '%s (%s)'.format(s.name, s.comment) : s.name);
+               });
                so.rmempty = false;
                so.editable = false;
                so.datatype = 'string';